From 4a2c087a1e3486c2223ce76c3fc718901af690ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Tue, 4 Oct 2016 18:14:35 +0200 Subject: [PATCH] widget: Remove gtk_widget_region_intersect --- gtk/gtkwidget.c | 37 ------------------------------------- gtk/gtkwidget.h | 3 --- 2 files changed, 40 deletions(-) diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index cc6c2ea6cc..90391f5d5d 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -7590,43 +7590,6 @@ gtk_widget_intersect (GtkWidget *widget, return return_val; } -/** - * gtk_widget_region_intersect: - * @widget: a #GtkWidget - * @region: a #cairo_region_t, in the same coordinate system as - * @widget->allocation. That is, relative to @widget->window - * for widgets which return %FALSE from gtk_widget_get_has_window(); - * relative to the parent window of @widget->window otherwise. - * - * Computes the intersection of a @widget’s area and @region, returning - * the intersection. The result may be empty, use cairo_region_is_empty() to - * check. - * - * Returns: A newly allocated region holding the intersection of @widget - * and @region. - * - * Deprecated: 3.14: Use gtk_widget_get_allocation() and - * cairo_region_intersect_rectangle() to get the same behavior. - */ -cairo_region_t * -gtk_widget_region_intersect (GtkWidget *widget, - const cairo_region_t *region) -{ - GdkRectangle rect; - cairo_region_t *dest; - - g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL); - g_return_val_if_fail (region != NULL, NULL); - - _gtk_widget_get_allocation (widget, &rect); - - dest = cairo_region_create_rectangle (&rect); - - cairo_region_intersect (dest, region); - - return dest; -} - /** * _gtk_widget_grab_notify: * @widget: a #GtkWidget diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 3de40b85a0..932bbf594e 100644 --- a/gtk/gtkwidget.h +++ b/gtk/gtkwidget.h @@ -748,9 +748,6 @@ GDK_AVAILABLE_IN_ALL gboolean gtk_widget_intersect (GtkWidget *widget, const GdkRectangle *area, GdkRectangle *intersection); -GDK_DEPRECATED_IN_3_14 -cairo_region_t *gtk_widget_region_intersect (GtkWidget *widget, - const cairo_region_t *region); GDK_AVAILABLE_IN_ALL void gtk_widget_freeze_child_notify (GtkWidget *widget); -- 2.30.2